From 350fb1d55c7453ad6e2117b032a4fcaea81ac68f Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 3 Dec 2010 16:14:31 +0100 Subject: [PATCH] API: gdk: Rename GdkWindowObjectClass to GdkWindowClass Be consistent in the naming of objects. --- docs/reference/gdk/gdk3-sections.txt | 2 +- gdk/gdkwindow.c | 14 +++++++------- gdk/gdkwindow.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt index e1c5bc5526..0f50dc48e2 100644 --- a/docs/reference/gdk/gdk3-sections.txt +++ b/docs/reference/gdk/gdk3-sections.txt @@ -516,7 +516,7 @@ GDK_TYPE_WM_FUNCTION gdk_window_get_type gdk_drawable_get_type GdkWindowObject -GdkWindowObjectClass +GdkWindowClass GdkWindowImpl GdkWindowImplClass GdkWindowRedirect diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 104ea41a7b..630c3a1b66 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -223,7 +223,7 @@ static void gdk_window_drop_cairo_surface (GdkWindow *private); static void gdk_window_free_paint_stack (GdkWindow *window); static void gdk_window_init (GdkWindow *window); -static void gdk_window_class_init (GdkWindowObjectClass *klass); +static void gdk_window_class_init (GdkWindowClass *klass); static void gdk_window_finalize (GObject *object); static void gdk_window_set_property (GObject *object, @@ -284,7 +284,7 @@ gdk_window_get_type (void) if (!object_type) object_type = g_type_register_static_simple (G_TYPE_OBJECT, "GdkWindow", - sizeof (GdkWindowObjectClass), + sizeof (GdkWindowClass), (GClassInitFunc) gdk_window_class_init, sizeof (GdkWindow), (GInstanceInitFunc) gdk_window_init, @@ -362,7 +362,7 @@ create_surface_accumulator (GSignalInvocationHint *ihint, static GQuark quark_pointer_window = 0; static void -gdk_window_class_init (GdkWindowObjectClass *klass) +gdk_window_class_init (GdkWindowClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -412,7 +412,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("pick-embedded-child"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkWindowObjectClass, pick_embedded_child), + G_STRUCT_OFFSET (GdkWindowClass, pick_embedded_child), accumulate_get_window, NULL, _gdk_marshal_OBJECT__DOUBLE_DOUBLE, GDK_TYPE_WINDOW, @@ -439,7 +439,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("to-embedder"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkWindowObjectClass, to_embedder), + G_STRUCT_OFFSET (GdkWindowClass, to_embedder), NULL, NULL, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, G_TYPE_NONE, @@ -468,7 +468,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("from-embedder"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkWindowObjectClass, from_embedder), + G_STRUCT_OFFSET (GdkWindowClass, from_embedder), NULL, NULL, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, G_TYPE_NONE, @@ -503,7 +503,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("create-surface"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkWindowObjectClass, create_surface), + G_STRUCT_OFFSET (GdkWindowClass, create_surface), create_surface_accumulator, NULL, _gdk_marshal_BOXED__INT_INT, CAIRO_GOBJECT_TYPE_SURFACE, diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index b25b5f9ec7..936e69af20 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -475,17 +475,17 @@ struct _GdkPointerHooks }; typedef struct _GdkWindowObject GdkWindowObject; -typedef struct _GdkWindowObjectClass GdkWindowObjectClass; +typedef struct _GdkWindowClass GdkWindowClass; #define GDK_TYPE_WINDOW (gdk_window_get_type ()) #define GDK_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow)) -#define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass)) +#define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowClass)) #define GDK_IS_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW)) #define GDK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW)) -#define GDK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass)) +#define GDK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowClass)) -struct _GdkWindowObjectClass +struct _GdkWindowClass { GObjectClass parent_class; -- 2.30.2